dont run check targets in build, to allow running them separately later
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>
Sun, 24 Jun 2012 12:01:54 +0000 (14:01 +0200)
committerRene Engelhard <rene@debian.org>
Mon, 27 Aug 2012 16:47:58 +0000 (16:47 +0000)
Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243

Gbp-Pq: Name build-dont-run-checks.diff

Makefile.top
solenv/bin/build.pl
solenv/gbuild/Module.mk

index c192dc5092ff472c0c229cefaef4d6e71a856548..316902479426496cde088fd5b66ea77d3243fb67 100644 (file)
@@ -244,7 +244,7 @@ xsltml\
 zlib\
 
 gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)
-export gb_TAILBUILDTARGET=all slowcheck
+export gb_TAILBUILDTARGET=all
 
 define gbuild_module_rules
 .PHONY: $(1) $(1).all $(1).clean $(1).deliver
@@ -487,11 +487,17 @@ findunusedcode:
               | grep -v WPX \
               > unusedcode.easy
 
-check: dev-install subsequentcheck
+check: unitcheck slowcheck dev-install subsequentcheck
 
 subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
        $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
 
+unitcheck:
+       $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+
+slowcheck:
+       $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+
 debugrun:
        $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
 
index 74d0f32ee087236d7a09f6e2238a211dcc214a8c..daa4ae0d63a693bd70314fc1517c60d21fa7242a 100755 (executable)
@@ -1901,7 +1901,7 @@ sub run_job {
             return 1 if (! $path =~ /prj$/ );
             mkpath("$workdir/Logs");
             my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
-            my $gbuild_target = 'all slowcheck';
+            my $gbuild_target = 'all';
             if ($registered_name =~ /tail_build\/prj$/ )
             {
                 $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
index e5f87f0f5cd49466cc8f1b03998d565da176217b..9c2608cc8566f0f554166074f56fb21f27b3964d 100644 (file)
@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
 debugrun :| build
 endif
 
-all : build unitcheck
+all : build
        $(info $(gb_Module_BUILDHINT))
 
 build :